From 0fd21fa2eda0db101ef8f3294accdbb18874178a Mon Sep 17 00:00:00 2001 From: Cody Russell Date: Mon, 8 Oct 2007 15:02:23 +0000 Subject: [PATCH] Fix memory leak, and fix two instances where a GtkRequisition and a 2007-10-08 Cody Russell * modules/engines/ms-windows/msw_style.c: (draw_tab): Fix memory leak, and fix two instances where a GtkRequisition and a GtkBorder were being freed with g_free() rather than gtk_requisition_free() and gtk_border_free(). (#484730, Daniel Atallah) svn path=/trunk/; revision=18893 --- ChangeLog | 7 +++++++ modules/engines/ms-windows/msw_style.c | 8 ++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7e565d8fc9..ede645b900 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2007-10-08 Cody Russell + * modules/engines/ms-windows/msw_style.c: + (draw_tab): Fix memory leak, and fix two instances where + a GtkRequisition and a GtkBorder were being freed with + g_free() rather than gtk_requisition_free() and + gtk_border_free(). (#484730, Daniel Atallah) + 2007-10-08 Cody Russell * docs/reference/gdk/tmpl/event_structs.sgml: Fix a typo in GdkEventGrabBroken where it said diff --git a/modules/engines/ms-windows/msw_style.c b/modules/engines/ms-windows/msw_style.c index 9b61f590ab..97ddbf6e02 100755 --- a/modules/engines/ms-windows/msw_style.c +++ b/modules/engines/ms-windows/msw_style.c @@ -1606,7 +1606,7 @@ option_menu_get_props (GtkWidget * widget, if (tmp_size) { *indicator_size = *tmp_size; - g_free (tmp_size); + gtk_requisition_free (tmp_size); } else *indicator_size = default_option_indicator_size; @@ -1614,7 +1614,7 @@ option_menu_get_props (GtkWidget * widget, if (tmp_spacing) { *indicator_spacing = *tmp_spacing; - g_free (tmp_spacing); + gtk_border_free (tmp_spacing); } else *indicator_spacing = default_option_indicator_spacing; @@ -2261,10 +2261,6 @@ draw_tab (GtkStyle * style, } } - if (widget) - gtk_widget_style_get (widget, "indicator_size", &indicator_size, - NULL); - option_menu_get_props (widget, &indicator_size, &indicator_spacing); x += (width - indicator_size.width) / 2; -- 2.30.2